Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Sun, 3 Jan 2016 15:32:24 +0000 (10:32 -0500)
committerTom Rini <[email protected]>
Sun, 3 Jan 2016 15:32:24 +0000 (10:32 -0500)

Trivial merge